branching-and-merging

I'm the only one in my organization who's making commits with the following message: Merge remote-tracking branch 'origin/develop' into develop Not sure what I'm doing to cause them, but I'd like to stop. What command am I issuing to create this commit, and what is the proper command I ought to be using to not produce it? Richard Hansen 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

I had an interesting thing happen using git, wondering if anyone could explain it to me so I can understand better. When doing a merge of multiple branches (A,B), git merge A B fails as non-fast-forward, while git merge B A worked well. Why would that be? huitseeker Let's assume that A is a strict, direct child of the current branch. Then assume that B is a strict, direct child of A . The octopus merge, which processes heads given as arguments from left to right , incrementally with respect to the tree , but independently with respect to the index succeeds without conflict if it tries to apply

I'm a team leader in our web development company, and I'd like to implement Git workflow in our team. Reading documentation and articles I've found the following structure good for us: We have a repository in a Bitbucket. Master branch is considered to contain stable code only. Every dev must create his own branch and implement features/bugfixes in his own branch. Once he decides, that his code is ready, he creates a nice branch history (using rebase, amend, cherry-pick etc.) and pushes it to Bitbucket, where creates a pull request to master branch. QA verifies functionality and approves (or

In tortoiseSvn 1.8 there is no "reintegrate" a branch option. What is the right way to reintegrate a branch in Tortoise Svn 1.8? In choose merge and then next option: Then I get next window: Or am I doing something else wrong? Just merge branch to any TARGET Edit OK, extended answer: "Merge for Dummies" in pictures Preface OK, I will not mask or hide used proving ground. Used in this sample resources: Repository "Hello, World" http://mayorat.ursinecorner.ru:8088/svn/Hello/ Branch http://mayorat.ursinecorner.ru:8088/svn/Hello/branches/branche-francaise Trunk of repo http://mayorat.ursinecorner

I just encountered a problem when merging a branch into master in git. First, I got the branch name by running git ls-remote . Let's call that branch "branch-name". I then ran git merge branch-name command and got the following result: fatal: branch-name - not something we can merge How do I resolve this error? Brian As shown in How does "not something we can merge" arise? , this error can arise from a typo in the branch name because you are trying to pull a branch that doesn't exist. If that is not the problem (as in my case), it is likely that you don't have a local copy of the branch that