gistfile1.txt

(gammapy-dev) hfm-1804a:gammapy2 deil$ git fetch enrique
From https://github.com/Bultako/gammapy
 * [new branch]          bar        -> enrique/bar
(gammapy-dev) hfm-1804a:gammapy2 deil$ git checkout HLI
Switched to branch 'HLI'
Your branch is up to date with 'enrique/HLI'.
(gammapy-dev) hfm-1804a:gammapy2 deil$ git status
On branch HLI
Your branch is up to date with 'enrique/HLI'.

nothing to commit, working tree clean
(gammapy-dev) hfm-1804a:gammapy2 deil$ ls -lh
total 312
-rw-r--r--    1 deil  staff    71K Aug 27 09:34 CHANGES.rst
-rw-r--r--    1 deil  staff   723B Jul 17 05:58 LONG_DESCRIPTION.rst
-rw-r--r--    1 deil  staff   549B Aug 27 09:41 MANIFEST.in
-rw-r--r--    1 deil  staff   4.9K Aug 27 09:41 Makefile
-rw-r--r--    1 deil  staff   1.7K Jul 17 05:58 README.rst
drwxr-xr-x    3 deil  staff    96B Aug 23 21:11 __pycache__
-rw-r--r--    1 deil  staff    36K Aug 27 09:41 ah_bootstrap.py
drwxr-xr-x    2 deil  staff    64B Aug 27 09:41 astropy_helpers
-rw-r--r--    1 deil  staff   3.0K Aug 27 09:41 azure-pipelines.yml
drwxr-xr-x    4 deil  staff   128B Aug 23 21:11 build
drwxr-xr-x    7 deil  staff   224B Jul 17 05:58 dev
drwxr-xr-x   32 deil  staff   1.0K Aug 27 09:41 docs
-rw-r--r--    1 deil  staff   827B Aug 27 09:41 environment-dev.yml
drwxr-xr-x   10 deil  staff   320B Jul 17 16:21 examples
drwxr-xr-x   27 deil  staff   864B Aug 27 09:41 gammapy
drwxr-xr-x    9 deil  staff   288B Aug 23 21:11 gammapy.egg-info
drwxr-xr-x  168 deil  staff   5.3K Aug 26 09:43 htmlcov
-rw-r--r--    1 deil  staff   357B Aug 27 09:41 lgtm.yml
drwxr-xr-x    4 deil  staff   128B Jul 17 05:58 licenses
-rw-r--r--    1 deil  staff   1.0K Aug 27 09:41 setup.cfg
-rwxr-xr-x    1 deil  staff   4.8K Aug 27 09:41 setup.py
drwxr-xr-x   29 deil  staff   928B Aug 27 09:34 tutorials
(gammapy-dev) hfm-1804a:gammapy2 deil$ ls -lh .gitignore 
-rw-r--r--  1 deil  staff   896B Aug 27 09:41 .gitignore
(gammapy-dev) hfm-1804a:gammapy2 deil$ git status
On branch HLI
Your branch is up to date with 'enrique/HLI'.

nothing to commit, working tree clean
(gammapy-dev) hfm-1804a:gammapy2 deil$ 
(gammapy-dev) hfm-1804a:gammapy2 deil$ 
(gammapy-dev) hfm-1804a:gammapy2 deil$ 
(gammapy-dev) hfm-1804a:gammapy2 deil$ git rebase origin/master
First, rewinding head to replay your work on top of it...
Applying: Add jsonschema dependency
Using index info to reconstruct a base tree...
M	setup.py
Falling back to patching base and 3-way merge...
Auto-merging setup.py
CONFLICT (content): Merge conflict in setup.py
error: Failed to merge in the changes.
Patch failed at 0001 Add jsonschema dependency
Use 'git am --show-current-patch' to see the failed patch

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".

(gammapy-dev) hfm-1804a:gammapy2 deil$ git status
rebase in progress; onto 1eb9a849e
You are currently rebasing branch 'HLI' on '1eb9a849e'.
  (fix conflicts and then run "git rebase --continue")
  (use "git rebase --skip" to skip this patch)
  (use "git rebase --abort" to check out the original branch)

Unmerged paths:
  (use "git reset HEAD <file>..." to unstage)
  (use "git add <file>..." to mark resolution)

	both modified:   setup.py

no changes added to commit (use "git add" and/or "git commit -a")
(gammapy-dev) hfm-1804a:gammapy2 deil$ emacs setup.py 
(gammapy-dev) hfm-1804a:gammapy2 deil$ git status
rebase in progress; onto 1eb9a849e
You are currently rebasing branch 'HLI' on '1eb9a849e'.
  (fix conflicts and then run "git rebase --continue")
  (use "git rebase --skip" to skip this patch)
  (use "git rebase --abort" to check out the original branch)

Unmerged paths:
  (use "git reset HEAD <file>..." to unstage)
  (use "git add <file>..." to mark resolution)

	both modified:   setup.py

no changes added to commit (use "git add" and/or "git commit -a")
(gammapy-dev) hfm-1804a:gammapy2 deil$ 
(gammapy-dev) hfm-1804a:gammapy2 deil$ 
(gammapy-dev) hfm-1804a:gammapy2 deil$ 
(gammapy-dev) hfm-1804a:gammapy2 deil$ git add -u
(gammapy-dev) hfm-1804a:gammapy2 deil$ git status
rebase in progress; onto 1eb9a849e
You are currently rebasing branch 'HLI' on '1eb9a849e'.
  (all conflicts fixed: run "git rebase --continue")

nothing to commit, working tree clean
(gammapy-dev) hfm-1804a:gammapy2 deil$ git status
rebase in progress; onto 1eb9a849e
You are currently rebasing branch 'HLI' on '1eb9a849e'.
  (all conflicts fixed: run "git rebase --continue")

nothing to commit, working tree clean
(gammapy-dev) hfm-1804a:gammapy2 deil$ git rebase --continue
Applying: Add jsonschema dependency
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.

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".

(gammapy-dev) hfm-1804a:gammapy2 deil$ git status
rebase in progress; onto 1eb9a849e
You are currently rebasing branch 'HLI' on '1eb9a849e'.
  (all conflicts fixed: run "git rebase --continue")

nothing to commit, working tree clean
(gammapy-dev) hfm-1804a:gammapy2 deil$ git rebase --continue
Applying: Add jsonschema dependency
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.

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".

(gammapy-dev) hfm-1804a:gammapy2 deil$ git add .
(gammapy-dev) hfm-1804a:gammapy2 deil$ git status
rebase in progress; onto 1eb9a849e
You are currently rebasing branch 'HLI' on '1eb9a849e'.
  (all conflicts fixed: run "git rebase --continue")

nothing to commit, working tree clean
(gammapy-dev) hfm-1804a:gammapy2 deil$ git rebase --continue
Applying: Add jsonschema dependency
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.

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".

(gammapy-dev) hfm-1804a:gammapy2 deil$ git rebase --skip
Applying: Add configuration and schema yaml files
Applying: Add initial skeleton for Analysis class
Applying: Add test analysis
Applying: Add astropy quantities validation
Applying: Make session Analysis class a singleton
Applying: Add config params setting by user and validation
Applying: Add tests for listing, setting and removing config parameters
Applying: Add reset method and class docstrings
Using index info to reconstruct a base tree...
M	.travis.yml
M	azure-pipelines.yml
M	environment-dev.yml
Falling back to patching base and 3-way merge...
Auto-merging environment-dev.yml
Auto-merging azure-pipelines.yml
Auto-merging .travis.yml
Applying: Address review comments
(gammapy-dev) hfm-1804a:gammapy2 deil$ git status
On branch HLI
Your branch and 'enrique/HLI' have diverged,
and have 42 and 10 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

nothing to commit, working tree clean
(gammapy-dev) hfm-1804a:gammapy2 deil$ 
(gammapy-dev) hfm-1804a:gammapy2 deil$