Skip to content

EKibort/GitBranchConflictReport

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

3 Commits
 
 
 
 
 
 
 
 
 
 

Repository files navigation

Detection merge conflicts between branches of same git repository

Example:

python git_branch_conflicts.py "D:\Reps\gitconflictstest" "conflicts.html"

Report looks like:

branchbranchfiles
b1b2
  • folder/f1.txt
  • test.txt
b2b1
  • folder/f1.txt
  • test.txt
master
  • folder/f1.txt
  • test.txt
b3
  • folder/f1.txt
  • test.txt
b3b2
  • folder/f1.txt
  • test.txt
masterb2
  • folder/f1.txt
  • test.txt

Output example:

2017-09-17 20:59:19,508 INFO Starting for 'D:\Reps\gitconflictstest'
2017-09-17 20:59:19,535 INFO Fetching branches ....
2017-09-17 20:59:19,685 INFO Checkout 'b1'
2017-09-17 20:59:20,040 INFO    Merging with 'master'
2017-09-17 20:59:20,438 INFO            Detect conflicts in files:
2017-09-17 20:59:20,440 INFO                    'CHANGELOG' - ignored
2017-09-17 20:59:20,440 INFO    Merging with 'b3'
2017-09-17 20:59:20,872 INFO            Detect conflicts in files:
2017-09-17 20:59:20,873 INFO                    'CHANGELOG' - ignored
2017-09-17 20:59:20,873 INFO    Merging with 'b2'
2017-09-17 20:59:21,240 INFO            Detect conflicts in files:
2017-09-17 20:59:21,241 INFO                    'test.txt'
2017-09-17 20:59:21,241 INFO                    'folder/f1.txt'
2017-09-17 20:59:21,242 INFO Checkout 'b2'
2017-09-17 20:59:21,617 INFO    Merging with 'master'
2017-09-17 20:59:22,020 INFO            Detect conflicts in files:
2017-09-17 20:59:22,021 INFO                    'test.txt'
2017-09-17 20:59:22,021 INFO                    'folder/f1.txt'
2017-09-17 20:59:22,021 INFO    Merging with 'b3'
2017-09-17 20:59:22,357 INFO            Detect conflicts in files:
2017-09-17 20:59:22,363 INFO                    'test.txt'
2017-09-17 20:59:22,364 INFO                    'folder/f1.txt'
2017-09-17 20:59:22,364 INFO Checkout 'b3'
2017-09-17 20:59:22,778 INFO    Merging with 'master'
2017-09-17 20:59:23,151 INFO Checkout 'master'

About

Detection merge conflicts between branches of same git repository

Resources

License

Stars

Watchers

Forks

Releases

No releases published

Packages

 
 
 

Contributors