issues
search
SeyZ
/
baboon
Detect source code merge conflicts in realtime. Simply get rid of merge hells.
http://baboon-project.org
120
stars
9
forks
source link
issues
Newest
Newest
Most commented
Recently updated
Oldest
Least commented
Least recently updated
Add conflict line numbers to log infos
#22
raphdg
closed
12 years ago
1
Using '/usr/bin/env python' to execute python with the current environment.
#21
PiWhy
closed
12 years ago
0
Windows support
#20
SeyZ
closed
12 years ago
1
OSX support
#19
SeyZ
closed
12 years ago
1
Replaced pyInotify with watchdog, not tested on osX and windows though
#18
raphdg
closed
12 years ago
0
No conflict detected if the file is not staged
#17
SeyZ
closed
12 years ago
2
signal.pause() does not work on Windows
#16
raphdg
closed
12 years ago
1
Color logs
#15
SeyZ
closed
12 years ago
0
Create a Subversion plugin
#14
SeyZ
closed
12 years ago
1
Create a setup.json
#13
SeyZ
closed
12 years ago
1
parse .hgignore
#12
SeyZ
closed
12 years ago
0
parse .gitignore
#11
SeyZ
closed
12 years ago
1
Create a difflib parser
#10
SeyZ
closed
12 years ago
1
Hidden files need to be ignore by default
#9
SeyZ
closed
12 years ago
1
Detection of new file
#8
SeyZ
closed
12 years ago
1
SIGINT support
#7
SeyZ
closed
12 years ago
0
What about add/remove spaces ?
#6
SeyZ
closed
12 years ago
1
Support deleted file
#5
SeyZ
closed
12 years ago
1
Avoid to detect a conflict when it's the same change
#4
SeyZ
closed
12 years ago
1
Added config file creation and recursive copy
#3
raphdg
closed
12 years ago
1
Renamed duplicate test_folder_enoent to test_folder_eexist. Weird that the unittest module did not catch this?
#2
raphdg
closed
12 years ago
0
Accept my pull request
#1
raphdg
closed
12 years ago
1
Previous