Bad links 011618

[mary-grace]

more progress on redhat-openstack/easyfix#24

fixed all but a few links. waiting for answers on a handful & others will tackle with bigger project.

[mary-grace]

@duck-rh @mscherer @rbowen I got the dreaded "branch cannot be rebased due to conflicts" error, but there aren't any hints to help me figure out what happened :( my gut feeling is that data/events got added in at some point. despite my being careful to not add it in as a change staged for commit, it disappeared from my list of changes not staged for commit after firing up the site locally. any thoughts or help is welcome!

[rbowen]

I always thought that the entire point of having events as a submodule, or whatever it's called, is to avoid having those files versioned along with the website files. Is this something that we can fix? Like, actually pull it out as a separate repo, and not have these stupid extra committed files with every PR? That would be awesome.

[mscherer]

The url www.community.redhat.com is not valid.

[mary-grace]

interesting... looks like http://community.redhat.com/ is just fine but www isn't. Is that something that should be fixed in the DNS side of things? Or are we not worried about it?

[mscherer]

So, I did tried, and the problem is a conflict on source/infra/index.html.md

Here is how I did reach the conclusion (using git cli, but any client should do the trick, some might even be easier for that in fact):

# update the repo
git fetch
# update master
git checkout master
git pull --rebase
# see the remote branches
git branch -a
# get a checkout of that remote branch
git checkout -b bad_links remotes/origin/bad-links-011618
# try to rebase manually
git rebase master

Then it show me the following:

First, rewinding head to replay your work on top of it...
Applying: fixed all links under `/source/what/`
Applying: links fixed for `source/blog/` files
Applying: fixed image name and location
Applying: fixed testday links
Applying: fixed various other links
Applying: last batch of bad links
Using index info to reconstruct a base tree...
M	source/infra/index.html.md
Falling back to patching base and 3-way merge...
Auto-merging source/infra/index.html.md
CONFLICT (content): Merge conflict in source/infra/index.html.md
Removing source/events/presentations/2016/ceph-rdo-barcelona/jpena.html
Failed to merge in the changes.
Patch failed at 0006 last batch of bad links
The copy of the patch that failed is found in:
   /home/misc/checkout/git/rdo_website/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

From there, the conflict in edition should appear, since 47d1a8a removed some code, but then
45575e7 readd it along the marker of conflict (the "<<<<<<")

So the UI of git for that is quite crap, but the solution would have been to merge the last 2 commits (using git commit --amend, or something like that, or git rebase -i).

I am gonna fix the branch manually on monday, unless people want me to explain the details (I do not want to assume people are uninterested, or do not want or can't learn that very specific skill of git branch fixing, there is nothing scary once you know, but I guess people prefer to get the fix rather than the fix + 1h of funny and exciting git lecture by me ).

Is it fine for people ?

[duck-rh]

@mary-grace one thing you can do to integrate the content of master back in your branch is to avoid merging, as this causes problems. First go to your master branch and update it with git pull. then on your topic branch you can integrate the new commits from master using git rebase master, then fix any conflict if any, and finally push the result using git push -f.

[mary-grace]

@mscherer Given how patch-heavy this pull request is, I'd love it if you could fix the branch manually & push it through. Much appreciated!

[mscherer]

I merged manually, sorry, I forgot this PR due to Devconf preparation, thanks to @mary-grace for reminding me :)

I will watch over the build during the day, in case something went wrong, but closing in the mean time.

[mary-grace]

thanks, @mscherer! :)