)]}'
{"update_feature_branch.sh":[{"author":{"_account_id":4146,"name":"Clark Boylan","email":"cboylan@sapwetik.org","username":"cboylan"},"change_message_id":"dfe23a288c6cdf881c2a13eeba0c35db8d51ff5b","unresolved":false,"context_lines":[{"line_number":15,"context_line":"# make sure master is up to date"},{"line_number":16,"context_line":"# (you don\u0027t ever make local commits directly to master, do you?)"},{"line_number":17,"context_line":"git checkout master"},{"line_number":18,"context_line":"git pull origin master"},{"line_number":19,"context_line":""},{"line_number":20,"context_line":"# make sure the feature branch is up to date"},{"line_number":21,"context_line":"git checkout $BRANCH"}],"source_content_type":"text/x-sh","patch_set":2,"id":"baa201ad_04ed1b26","line":18,"updated":"2014-10-07 20:31:52.000000000","message":"using `git reset --hard origin/master` will avoid the implicit merge that pull does.","commit_id":"8138d6331b2b6d47a056b140fac96c2390915648"},{"author":{"_account_id":4,"name":"Dolph Mathews","email":"dolph.mathews@gmail.com","username":"dolph"},"change_message_id":"96a5f80d2f8da1b58a70c023b09472b2f5d6900b","unresolved":false,"context_lines":[{"line_number":15,"context_line":"# make sure master is up to date"},{"line_number":16,"context_line":"# (you don\u0027t ever make local commits directly to master, do you?)"},{"line_number":17,"context_line":"git checkout master"},{"line_number":18,"context_line":"git pull origin master"},{"line_number":19,"context_line":""},{"line_number":20,"context_line":"# make sure the feature branch is up to date"},{"line_number":21,"context_line":"git checkout $BRANCH"}],"source_content_type":"text/x-sh","patch_set":2,"id":"baa201ad_64b7c7f5","line":18,"in_reply_to":"baa201ad_04ed1b26","updated":"2014-12-02 01:45:51.000000000","message":"based on comment in L28, replacing these with:\n\n  git remote update","commit_id":"8138d6331b2b6d47a056b140fac96c2390915648"},{"author":{"_account_id":4146,"name":"Clark Boylan","email":"cboylan@sapwetik.org","username":"cboylan"},"change_message_id":"dfe23a288c6cdf881c2a13eeba0c35db8d51ff5b","unresolved":false,"context_lines":[{"line_number":19,"context_line":""},{"line_number":20,"context_line":"# make sure the feature branch is up to date"},{"line_number":21,"context_line":"git checkout $BRANCH"},{"line_number":22,"context_line":"git pull --ff-only origin $BRANCH"},{"line_number":23,"context_line":""},{"line_number":24,"context_line":"# create a temporary branch"},{"line_number":25,"context_line":"git checkout -b merge-branch"}],"source_content_type":"text/x-sh","patch_set":2,"id":"baa201ad_04d43b46","line":22,"updated":"2014-10-07 20:31:52.000000000","message":"Same here `git reset --hard origin/feature/foo` though the --ff-only will protect you in this case but may cause failures if you have diverged from upstream.","commit_id":"8138d6331b2b6d47a056b140fac96c2390915648"},{"author":{"_account_id":4,"name":"Dolph Mathews","email":"dolph.mathews@gmail.com","username":"dolph"},"change_message_id":"96a5f80d2f8da1b58a70c023b09472b2f5d6900b","unresolved":false,"context_lines":[{"line_number":19,"context_line":""},{"line_number":20,"context_line":"# make sure the feature branch is up to date"},{"line_number":21,"context_line":"git checkout $BRANCH"},{"line_number":22,"context_line":"git pull --ff-only origin $BRANCH"},{"line_number":23,"context_line":""},{"line_number":24,"context_line":"# create a temporary branch"},{"line_number":25,"context_line":"git checkout -b merge-branch"}],"source_content_type":"text/x-sh","patch_set":2,"id":"baa201ad_a4936f59","line":22,"in_reply_to":"baa201ad_04d43b46","updated":"2014-12-02 01:45:51.000000000","message":"++ my workflow avoids this risk, so i didn\u0027t even consider it. will replace L21 \u0026 L22 with just:\n\n  git reset --hard origin/$BRANCH","commit_id":"8138d6331b2b6d47a056b140fac96c2390915648"},{"author":{"_account_id":4146,"name":"Clark Boylan","email":"cboylan@sapwetik.org","username":"cboylan"},"change_message_id":"dfe23a288c6cdf881c2a13eeba0c35db8d51ff5b","unresolved":false,"context_lines":[{"line_number":25,"context_line":"git checkout -b merge-branch"},{"line_number":26,"context_line":""},{"line_number":27,"context_line":"# create a merge commit"},{"line_number":28,"context_line":"git merge origin/master --message \"Update the $BRANCH branch\""},{"line_number":29,"context_line":""},{"line_number":30,"context_line":"# amend the merge commit to automatically add a Change-ID to the commit message"},{"line_number":31,"context_line":"GIT_EDITOR\u003dtrue git commit --amend"}],"source_content_type":"text/x-sh","patch_set":2,"id":"baa201ad_445803fa","line":28,"updated":"2014-10-07 20:31:52.000000000","message":"The git merge origin/master avoids the need for the master update on lines 17 and 18. Maybe just replace those with `git remote update` so that origin/master is up to date then this merge gets latest code?","commit_id":"8138d6331b2b6d47a056b140fac96c2390915648"},{"author":{"_account_id":4,"name":"Dolph Mathews","email":"dolph.mathews@gmail.com","username":"dolph"},"change_message_id":"96a5f80d2f8da1b58a70c023b09472b2f5d6900b","unresolved":false,"context_lines":[{"line_number":25,"context_line":"git checkout -b merge-branch"},{"line_number":26,"context_line":""},{"line_number":27,"context_line":"# create a merge commit"},{"line_number":28,"context_line":"git merge origin/master --message \"Update the $BRANCH branch\""},{"line_number":29,"context_line":""},{"line_number":30,"context_line":"# amend the merge commit to automatically add a Change-ID to the commit message"},{"line_number":31,"context_line":"GIT_EDITOR\u003dtrue git commit --amend"}],"source_content_type":"text/x-sh","patch_set":2,"id":"baa201ad_e4a737a5","line":28,"in_reply_to":"baa201ad_445803fa","updated":"2014-12-02 01:45:51.000000000","message":"Done","commit_id":"8138d6331b2b6d47a056b140fac96c2390915648"},{"author":{"_account_id":308,"name":"Thierry Carrez","email":"thierry@openstack.org","username":"ttx"},"change_message_id":"4e57a492cebd283bf5036079c947dde0b1277c0b","unresolved":false,"context_lines":[{"line_number":30,"context_line":""},{"line_number":31,"context_line":"    # push the merge commit to gerrit without a scary confirmation"},{"line_number":32,"context_line":"    # git review --yes --no-rebase $BRANCH"},{"line_number":33,"context_line":"    echo \"git review --yes --no-rebase $BRANCH\""},{"line_number":34,"context_line":"} || {"},{"line_number":35,"context_line":"    echo \"Failed to create and upload the merge commit.\" \u003e\u00262"},{"line_number":36,"context_line":"}"}],"source_content_type":"text/x-sh","patch_set":3,"id":"3a961159_e0be9cd3","line":33,"updated":"2014-12-10 14:58:16.000000000","message":"This feels like a debug leftover ? Shouldn\u0027t the script directly run git review ?","commit_id":"bfe5c023bf46b90ce01b0020cac364c19a44286b"}]}
