Conflicted solved#1
Open
lauratll wants to merge 2 commits intota-data-remote:masterfrom
lauratll:master
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Hi Raul!
I don't know exactly how you can see how I resolved the conflict because maybe I forgot to commit in one of the steps...
Anyway, once I encountered the conflict I had to come back to an earlier version. After I created a local parallel branch. I pull the repo from my remote main to my master branch. I have merged my local parallel branch with the local master. And push to remote. I think that would be the best way to work with more people.
But basically I learned that when you encounter those type of conflicts, you might have to choose what to loose. Otherwise find another way to work where you can keep track of those changes in case this happens or always work with branches to make sure you can pull on your master first.