mhagger git-imerge issues

mhagger / git-imerge

Incremental merge for git

GNU General Public License v2.0

2.68k stars 125 forks source link

issues

Newest

Newest Most commented Recently updated Oldest Least commented Least recently updated

Undocumented requirement: setuptools

#210 dabrahams opened 1 month ago
0
Question: can git-imerge product a list of all conflicts in advance and their associated commits?

#209 hpe-ykoehler closed 6 months ago
1
add support for new Python `pyproject.toml` standard: `setup.py install` is deprecated

#208 pabs3 opened 11 months ago
0
Link to a list of distros instead of one specific distro

#207 pabs3 opened 1 year ago
0
Drop Python minor versions from programming language list

#206 pabs3 opened 1 year ago
0
Fix typo in a comment

#205 pabs3 opened 1 year ago
0
Fix test failure with Tox 4.x

#204 pabs3 opened 1 year ago
0
possibility of merging unrelated histories

#203 Avinash-Bhat opened 1 year ago
0
backtracking repeats unrelated autofills

#202 jrosenberger opened 1 year ago
0
Document support for Python 3.10 and 3.11

#201 waldyrious opened 1 year ago
0
Remove support for end-of-life Python versions

#200 waldyrious opened 1 year ago
0
Stuck in a merge, imerge crashes when attempting to continue

#199 vmsh0 opened 1 year ago
2
Automate ability to extend merge when source branches are updated

#198 jrosenberger closed 1 year ago
3
[Request] Keep diff3 conflictstyle as clear as without imerge

#197 tuxayo opened 1 year ago
3
How to manually cleanup in case of a crash?

#196 tuxayo closed 1 year ago
4
GitRepository.manualmerge(): turn off rerere

#195 mhagger opened 1 year ago
0
Remove support for end-of-life Python versions

#194 jdufresne closed 1 year ago
0
Document support for Python 3.10

#193 jdufresne closed 1 year ago
0
Add TL;DR reminder

#192 abitrolly opened 2 years ago
4
[Question] why is such a feature not integrated in git main?

#191 LowLevelMahn closed 2 years ago
1
Cannot proceed dead lock ( maybe related to `git lfs` in history? )

#190 flybyray closed 2 years ago
2
add a stop, abort, or similar command

#189 jacob-keller opened 2 years ago
5
Is it possible to redo parts of an iterative merge?

#188 BowiFromStackOverflow opened 2 years ago
4
non-zero exit status 128

#187 jeacott1 opened 2 years ago
2
Merging a branch that has merge commits

#186 OliverJAsh opened 3 years ago
1
Why autofills if automerge succeeds?

#185 egpbos closed 3 years ago
2
Error: untracked working tree files aborts imerge

#184 egpbos opened 3 years ago
6
Exact equivalent of `git rebase --onto ancient origin/ancient modern` ?

#183 rulatir closed 3 years ago
2
Add Python3 shebang

#182 abitrolly opened 3 years ago
9
README: update installation instructions

#181 waldyrious closed 3 years ago
1
README: mention Homebrew as a possible installation method on macOS

#180 DilumAluthge closed 3 years ago
3
docs: fix simple typo, octipus -> octopus

#179 timgates42 closed 3 years ago
1
Add trove classifiers for Python 3.8 and 3.9

#178 jdufresne closed 3 years ago
1
Identifying list of conflicting commits

#177 ericcurtin closed 3 years ago
1
If `completionsdir` is not configured, just skip installing completions

#176 mhagger closed 3 years ago
1
Move Makefile to the talk directory

#175 pabs3 closed 3 years ago
1
Update links from http to https

#174 pabs3 closed 3 years ago
1
Synchronise description from the README to setup.py

#173 pabs3 closed 3 years ago
1
Add a README section about alternatives to git-imerge

#172 pabs3 closed 3 years ago
1
Skip incompatible merges

#171 NZJenkins opened 3 years ago
1
Interactive Rebase With History Preserving Past Merges

#170 RandomDSdevel opened 3 years ago
1
Make the `MergeFrontier` class polymorphic

#169 mhagger closed 3 years ago
0
Convert the README and TODO to markdown

#168 mhagger closed 3 years ago
0
Add some more tests, and improve the existing ones

#167 mhagger closed 3 years ago
0
Remove unused method `GitRepository.rev_list()`

#166 mhagger closed 3 years ago
0
Make the tests a bit smoother and faster

#165 mhagger closed 3 years ago
0
Option to keep original commit message in goal=rebase-with-history

#164 ravirajkarasulli opened 3 years ago
1
Make it easy to amend a completed imerge

#163 dabrahams opened 3 years ago
1
Please document my options w.r.t. merge resolution

#162 dabrahams opened 3 years ago
1
imerge sometimes reports a conflict, leaving unmerged files with zero conflicts

#161 dabrahams opened 3 years ago
10