Those are conflict markers. You’re still in the process of merging, but there were some parts that Git couldn’t merge automatically. You’ll need to hand-edit those parts to what you want them to be and then commit the results. For instance, in your particular case, you’d probably want to resolve it like this (note – … Read more
You just merge develop to feature1: git checkout feature1 git merge develop There is no need to involve another branch such as master.
From SourceTree, click on Tools->Options. Then on the “General” tab, make sure to check the box to allow SourceTree to modify your Git config files. Then switch to the “Diff” tab. On the lower half, use the drop down to select the external program you want to use to do the diffs and merging. I’ve … Read more
Note that git rebase has a different job than git merge (with or without –ff-only). What rebase does is to take existing commits and copy them. Suppose, for instance, that you’re on branch1 and have made two commits A and B: …-o–o–A–B <– HEAD=branch1 \ o–C <– branch2 and you decide that you’d rather have … Read more
First, you and those you’re working with need to agree whether a topic/devel branch is for shared development or just your own. Other developers know not to merge on my development branches because they’ll be rebased at any time. Usually the workflow is as follows: o—–o—–o—–o—–o—–o master \ o—–o—–o devel0 \ o—–o—–o devel1 Then to … Read more
Do git rebase -i <sha before the branches diverged> this will allow you to remove the merge commit and the log will be one single line as you wanted. You can also delete any commits that you do not want any more. The reason that your rebase wasn’t working was that you weren’t going back … Read more
git pull is probably creating the commit. If you make a local commit and then run git pull after someone else pushes a commit up to the repository, Git downloads the other developer’s commit and then merges it into your local branch. How to avoid these merge commits in the future You could use git … Read more
Short Answer It is possible to do (in the deployed repository): git fetch –all // git fetch will download all the recent changes, but it will not put it in your current checked out code (working area). Followed by: git checkout origin/master — path/to/file // git checkout <local repo name (default is origin)>/<branch name> — … Read more
Update: As of Visual Studio Code 1.70 Three-way merge with improvements were added. Visuals and further explanations are available if that’s of interest to you 😉. As of Visual Studio Code 1.13 Better Merge was integrated into the core of Visual Studio Code. The way to wire them together is to modify your .gitconfig and … Read more
It’s the one in the middle : BASE. In fact, BASE is not the common ancestor, but the half-finished merge where conflicts are marked with >>>> and <<<<. You can see the file names on the top of meld editing window. See the screenshot here You can edit the BASE file as you want with … Read more