不想在Git中自动合并master分支

时间:2014-09-03 07:12:54

标签: git version-control merge git-merge

我们是一个小型组,在主远程存储库中有两个分支 - origin / master(用于稳定代码)和origin / development(用于稳定更改)。 我们每个人都克隆了存储库,通过'git checkout -b development origin / development'获得连接的master-origin / master分支并创建了开发分支。当我们工作时,我们正在分支“开发”分支(例如'development-idea1'分支)在做了一些我们希望与其他人分享的工作变更后,我们就是这样做的:

git checkout development
git pull
git merge development-idea1
git push
git checkout development-idea1
git merge development

但几天之后,我们中的一个人想要更新主人,但Git说“它是最新的”。这两个命令

'git diff --name-status development..origin/development'
'git diff --name-status development..origin/master'

给了我们完全一样的...... 你能认识到,问题出在哪里了?

提前谢谢。

编辑: 这是我们的树

* 9bf5667 (origin/dev) clean up
*   eead2c5 Merge branch 'dev-vojta' into dev
|\  
| * fb58c33 new version
* | 88d8a54 Remove debug code.
* | 3dd7c47 processing
|/  
| * 0f9a231 (HEAD, dev-report) small report changes
| * b5d4618 more minilog lines
|/  
* ed845e6 (origin/master, origin/HEAD, master, dev-tomas, dev) trace2 new
*   5cde965 Merge branch 'dev-vojta' into dev
|\  
| * cdbc59c trace new
* |   3ac0125 Merge branch 'dev-vojta' into dev
|\ \  
| |/  
| * 737ae3f new trace
* |   fa1de24 Merge branch 'dev' of /hit/kit-git into dev
|\ \  
| * | d386248 minor changes across the pipeline
| * | 1da7a45 germinate
* | | fb9b397 new trace
* | |   6a54136 Merge branch 'dev-vojta' into dev
|\ \ \  
| |/ /  
|/| /   
| |/    
| * 6558502 new
* | b0dc15f clean up and germlines
* |   91bc91b Merge branch 'dev-nikos' into dev
|\ \  
| * | b9d65f5 hit and process work
* | |   2f9c8a0 Merge branch 'dev' of /hit/kit-git into dev
|\ \ \  
| |/ /  
|/| /   
| |/    
| *   5c0abe6 new trace Merge branch 'dev-vojta' into dev
| |\  
| | * 56b097c new trace
| * | af4c3ef .gitignore - only fasta and extra files included
| * | 8643645 test ''git_shell.sh' automatic script
| * | e900033 wmd report debug messages deleted
| * | 41aae9d .gitignore -  germlines/arrest.v-quest.refdir file separation wmd.pl - report subroutine basics
| * |   1b350f6 Merge branch 'dev' into dev-tomas
| |\ \  
| | |/  
| * | 1711df5 .gitignore - added folders 'germlines/' and 'scenarios/' wmd.pl - basic report subroutine

0 个答案:

没有答案