Skip to content

don't include untracked files in merge commit#6464

Merged
shiftkey merged 6 commits intodevelopmentfrom
leave-untracked-files-untracked
Jan 8, 2019
Merged

don't include untracked files in merge commit#6464
shiftkey merged 6 commits intodevelopmentfrom
leave-untracked-files-untracked

Conversation

@outofambit
Copy link
Contributor

@outofambit outofambit commented Dec 20, 2018 •
edited
Loading

🌵 🌵 waiting on #6468 🌵 🌵

Overview

closes #6411

Description

  • refactors component's click handler and AppStore/Dispatcher's createMergeCommit into more semantic finishConflictedMerge
  • adds a little logic to prevent committing untracked files during merge conflict resolution
  • adds untracked file to conflicted repo fixture (and fix broken tests as a result)
  • adds regression test 🎉

Release notes

Notes: Leave untracked files uncommitted during merge conflict resolution

@outofambit outofambit added the ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Dec 20, 2018
@outofambit outofambit added this to the 1.6.0 milestone Dec 20, 2018
shiftkey
shiftkey reviewed Dec 20, 2018
View reviewed changes
@shiftkey shiftkey self-assigned this Dec 20, 2018
@outofambit outofambit removed the ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Dec 20, 2018
@shiftkey shiftkey removed their assignment Dec 21, 2018
@outofambit outofambit changed the base branch from master to development December 27, 2018 21:46
@billygriffin
Copy link
Contributor

billygriffin commented Jan 7, 2019

Excited to see this! Does this also address #6349?

@outofambit
Copy link
Contributor Author

outofambit commented Jan 7, 2019

Does this also address #6349?

@billygriffin no 😢 , but its a step on the way to fixing that one!

@outofambit outofambit force-pushed the leave-untracked-files-untracked branch from 20f84f8 to 3fa539f Compare January 7, 2019 17:23
@outofambit outofambit added the ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Jan 7, 2019
@outofambit
Copy link
Contributor Author

outofambit commented Jan 7, 2019 •
edited
Loading

@shiftkey what do you think about this now, given the work we did in #6468 ?

@outofambit outofambit requested a review from shiftkey January 7, 2019 17:29
@shiftkey
Copy link
Member

shiftkey commented Jan 7, 2019

@outofambit I'd still like to see a regression test added that confirms the behaviour and that this fixes the issue

@outofambit outofambit removed the ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Jan 7, 2019
@outofambit outofambit removed the request for review from shiftkey January 7, 2019 17:54
@billygriffin billygriffin mentioned this pull request Jan 7, 2019
Closed
@outofambit outofambit force-pushed the leave-untracked-files-untracked branch from 3fa539f to dd0f50d Compare January 7, 2019 20:41
@outofambit outofambit added the ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Jan 7, 2019
@outofambit
Copy link
Contributor Author

outofambit commented Jan 7, 2019

@shiftkey had a run at introducing a more testable version (as well as a regression test). let me know your thoughts!

@shiftkey shiftkey self-assigned this Jan 7, 2019
shiftkey
shiftkey reviewed Jan 8, 2019
View reviewed changes
Copy link
Member

@shiftkey shiftkey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like where this ended up!

Some suggestions to tidy things up now we've got the test in place.

@outofambit
Copy link
Contributor Author

outofambit commented Jan 8, 2019

@shiftkey 🍕

@shiftkey shiftkey merged commit 5939bf3 into development Jan 8, 2019
@shiftkey shiftkey deleted the leave-untracked-files-untracked branch January 8, 2019 17:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@shiftkey shiftkey shiftkey approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@shiftkey shiftkey

Labels

ready-for-review Pull Requests that are ready to be reviewed by the maintainers

Projects

None yet

Milestone

1.6.0

Development

Successfully merging this pull request may close these issues.

Merge Conflicts cannot proceed when untracked files exist

3 participants

@outofambit @billygriffin @shiftkey