These are chat archives for coala/coala-bears

14th
Nov 2018
Sharikzama
@ZamaSharik
Nov 14 2018 02:41
sorry!
Sharikzama
@ZamaSharik
Nov 14 2018 07:17
when I try to git rebase -i master I get this message
Auto-merging bears/js/JSONFormatBear.py
CONFLICT (content): Merge conflict in bears/js/JSONFormatBear.py
error: could not apply 1a94d90... JSONFormatBear.py: Fix erroneous message

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

Could not apply 1a94d90... JSONFormatBear.py: Fix erroneous message
Abhinav Kaushlya
@abhishalya
Nov 14 2018 07:20
@Sidsharik You don't have to push a new commit everytime :sweat_smile:
First squash all commits into one
Then do a git status
Remove the irrelevant files
And amend the commit
Then maybe it'll look better
Sharikzama
@ZamaSharik
Nov 14 2018 07:32
But, I am unable to squash the commits because of some merge conflicts.
John Vandenberg
@jayvdb
Nov 14 2018 07:32
you shouldnt merge
you should rebase
and when you get conflicts, you need to resolve them
@gutsytechster that version is the default on ubuntu trusty. we dont choose it
@Sidsharik , you need to find the solution without creating a new PR. this is git training. mandatory ;-)
Abhinav Kaushlya
@abhishalya
Nov 14 2018 07:45
@Sidsharik Best of luck :smiley:
Sharikzama
@ZamaSharik
Nov 14 2018 07:53

after resolving them and git rebase --continue

[detached HEAD 6331cf5] JSONFormatBear.py: Fix erroneous message
 Date: Tue Nov 13 22:26:09 2018 +0530
 5 files changed, 835 insertions(+)
 create mode 100644 .pytest_cache/v/cache/lastfailed
 create mode 100644 .pytest_cache/v/cache/nodeids
 create mode 100644 bears/js/.vscode/settings.json
 create mode 100644 tests/js/.vscode/settings.json
Successfully rebased and updated refs/heads/JSONFormatBear.

I got this message

John Vandenberg
@jayvdb
Nov 14 2018 08:00
now delete all those created files ... they dont belong in the repo
and check git log to ensure you have only one commit which is different from the top commit in the upstream repo
Sharikzama
@ZamaSharik
Nov 14 2018 08:34
you mean the files in the above message like the tests/js/.vscode/settings.json
?
Boxuan Li
@li-boxuan
Nov 14 2018 08:38
Yes @Sidsharik
Sharikzama
@ZamaSharik
Nov 14 2018 11:56
can someone review #2780 Thanks.
Boxuan Li
@li-boxuan
Nov 14 2018 13:15
@Sidsharik People cannot review it until you fix messy commits.
John Vandenberg
@jayvdb
Nov 14 2018 13:20

@Sidsharik

and check git log to ensure you have only one commit which is different from the top commit in the upstream repo

do not push until you have verified that you only have one commit in git log