Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

To work with Git #1

Closed
Symbolk opened this issue Jul 31, 2019 · 1 comment
Closed

To work with Git #1

Symbolk opened this issue Jul 31, 2019 · 1 comment
Assignees
@Symbolk
Labels
enhancement New feature or request

Comments

@Symbolk
Copy link
Owner

Symbolk commented Jul 31, 2019 •
edited
Loading

No description provided.

@Symbolk
Copy link
Owner Author

Symbolk commented Aug 21, 2019 •
edited
Loading

Integrate through git subcommand:
git imerge
(call the GUI exe, Nodejs child_process exec jar with input branches, merge only Java files, other files are merged with Git, conflict mappings saved in temp file)

@Symbolk Symbolk changed the title Side bar collapse and expand To work with Git Aug 23, 2019
@Symbolk Symbolk added the enhancement New feature or request label Aug 23, 2019
@Symbolk Symbolk self-assigned this Aug 23, 2019
@Symbolk Symbolk closed this as completed Mar 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@Symbolk Symbolk

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@Symbolk