![]() ![]() Here is the git config for my copy of the repository. Ideally, I'd like to bring in some of the changes made by the other developer, because some files in the project are very difficult to merge. Here instead of actually merging the two branches git simply moves the current branch tip up to the target branch tip. Right-click the repository youre working on and click on Fetch from Upstream. Fast-Forward Merging Fast forward merge happens when the tip of the current branch (dev in our case) is a direct ancestor of the target branch (main in our case). That way, you can actually import projectb1 and projectb2 in the Eclipse workspace, and you can work/compile concurrently on both projects. project with different name in them like projectb1 and projectb2. ![]() This is a bit of a surprise.Ĭould someone help me understand why git is importing these changes while I'm branched, and how to control this behavior? At the least, I'd like to revert the files that don't compile to earlier versions, and prevent git from merging additional changes from master into my branch until I'm ready to merge back into master. Using Eclipse/EGit: Open the 'Git Repositories' View Make sure branch1 is checked out (respectively the branch you want to update with changes of the remote master branch). It is possible since git 2.5 and the git worktree add command have a. ![]() So now the non-working versions of certain files are in my workspace, even though I branched before those changes were checked in.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |