!qBjTvNDeNFthRIMZex:matrix.org

pigeon.digital

14 Members
www.pigeon.digital8 Servers

Load older messages


Timestamp Message
3 Nov 2019
14:53:37@thosgood:matrix.orgTimi suppose in an ideal world you’d be able to use either to write the maths in a message, but i still don’t think many people even know that asciimath exists
4 Nov 2019
16:43:12@thosgood:matrix.orgTimso... should I have a go at updating my fork to send images as a fallback, using this jsfiddle?
16:43:44@thosgood:matrix.orgTimlike I said though, I just am it git hell, because I want to basically restart my fork from scratch given how much the new composer has changed what I've done so far, and can't figure out the git-fu to do this
16:46:21@cadair:cadair.comCadair👍️ from me
16:46:23@cadair:cadair.comCadair * 👍️ from me
18:58:54@thosgood:matrix.orgTimany tips on the git situation?
19:00:20@cadair:cadair.comCadairWhat is it you want to do?
22:17:00@thosgood:matrix.orgTimbasically just have exactly the current develop branch
22:17:22@thosgood:matrix.orgTimbut if I merge it with what I have now then I have to check that no changes that I've made accidentally slip through
22:20:17@uhoreg:matrix.orguhoreg You can use git diff to check what changes have been made. For example, if you merge in what you've done, then you can do git diff develop to see what's different between your branch and the base develop branch. Or if you do git diff [commit hash that you originally branched from], then you can see what changes you originally made and manually apply them onto develop.
22:20:49@uhoreg:matrix.orguhoreg If there are certain commits that you want to apply, you can also use git cherry-pick [commit hash] to apply them onto develop.
22:26:06@thosgood:matrix.orgTimcan i do some sort of destructive rebase?
22:26:14@thosgood:matrix.orgTimi want to keep absolutely none of my changes
22:26:25@thosgood:matrix.orgTimi.e. I would just start a whole new fork, but then I'd lose the history
22:27:03@thosgood:matrix.orgTimI swear there's an easy git way to do this but just can't remember it
22:29:37@uhoreg:matrix.orguhoreg Are you wanting to reset the git history to be develop, but keep your modified files in the directory?
22:30:59@uhoreg:matrix.orguhoreg If that's what you want to do, then that would be git reset develop
22:32:51@thosgood:matrix.orgTimno, I want to save none of my changes
22:33:08@thosgood:matrix.orgTim I literally want to start with a brand new copy of develop how it currently is upstream now
22:35:49@uhoreg:matrix.orguhoreg git reset --hard develop would reset the history and the files to what develop is right now (you'd lose everything). Or you can create a new branch based on develop using git checkout -b [new branch name] develop
22:37:59@thosgood:matrix.orgTimoh, yeah, that's a much better idea actually: just make a new branch from the upstream
22:52:40@cadair:cadair.comCadair
In reply to@thosgood:matrix.org
i want to keep absolutely none of my changes

git reset --hard upstream/develop

23:09:30@thosgood:matrix.orgTimScreenshot 2019-11-05 at 00.09.12.png
Screenshot 2019-11-05 at 00.09.12.png
23:09:38@thosgood:matrix.orgTimhuh, I've updated both sdks and riot-web
23:09:41@thosgood:matrix.orgTimand yarn-install'd
23:09:48@thosgood:matrix.orgTimbut can't seem to yarn start anymore
11 Nov 2019
00:08:32@thosgood:matrix.orgTimso the next month is 'finishing thesis month' for me, which means i probably won't get much of a chance to work on this
00:08:36@thosgood:matrix.orgTimsorry to stall it again
00:11:45@uhoreg:matrix.orguhoregGood luck on your thesis!
00:13:01@thosgood:matrix.orgTimthanks!

There are no newer messages yet.


Back to Room List