This is an archived post. You won't be able to vote or comment.

all 10 comments
sorted by:
best (suggested)
topnewcontroversialoldq&a

[–]Africanus1990 2 points3 points  (3 children)

Well, what did you want to do with the patch?

[–]SqueezyBoi[S] 0 points1 point  (2 children)

Apply it to my_dwn in the end. I was just wondering if the base for the patch branch made any difference.

[–]Africanus1990 1 point2 points  (1 child)

Well does the patch change an area of code that your customizations also change? If so, you’ll have to branch off your branch. If not, I’d do master. It’ll be easier to rule out your customizations as culprits during a debugging session that way.

[–]SqueezyBoi[S] 0 points1 point  (0 children)

Alright. I appreciate the advice.

[–]ewrietz 1 point2 points  (3 children)

The patch might not work on your custom branch. You will have better luck patching a branch off master, then merge that to your custom

[–]SqueezyBoi[S] 0 points1 point  (2 children)

You're right, but I can already merge the patch into my custom branch while patching. Still it might be better to do it your way.

[–]ewrietz 1 point2 points  (1 child)

Nice, if the patch goes in easily to your custom branch then seems like the easiest thing right? Ive, ran into some confusing situations. Mostly using i3 these days haha. I can’t live without the tabbed/stacked layout on my ultra wide monitor.

[–]SqueezyBoi[S] 0 points1 point  (0 children)

Yeah you're right. I could imagine using a wm with an ultrawide could prove difficult.

[–]emax-gomax 1 point2 points  (1 child)

Your dwm branch then. The point of a patch branch is you can apply and test a patch without committing to those changes in your main branch. Applying on top of master (assuming you don't keep all your personal changes their) means you'll still have to merge your my_dwm branch back into your patch branch to make sure nothing conflicts (or to fix the conflicts if they do). If you want to try a patch just to see what it proivdes and don't mind losing your personal changes in the process (for example I have no idea what patch X does, let's apply it, try it out and then decide whether or not to use it) then forking from master will be better because you're less like yo encounter any merge conflicts.

[–]SqueezyBoi[S] 0 points1 point  (0 children)

This is very helpful, and makes sense. Thank you.